From 0de39dece460d0517fe78f7514703034466ff163 Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Wed, 31 Aug 2005 17:21:24 -0600 Subject: [PATCH] Move null header files to a separate directory --- xen/arch/ia64/Rules.mk | 2 ++ xen/include/asm-ia64/linux-null/README.origin | 3 +++ xen/include/asm-ia64/{linux => linux-null}/asm/desc.h | 0 xen/include/asm-ia64/{linux => linux-null}/asm/ia32.h | 0 xen/include/asm-ia64/{linux => linux-null}/asm/module.h | 0 xen/include/asm-ia64/{linux => linux-null}/asm/pdb.h | 0 xen/include/asm-ia64/{linux => linux-null/asm}/serial.h | 0 xen/include/asm-ia64/{linux => linux-null}/asm/sn/arch.h | 0 xen/include/asm-ia64/{linux => linux-null}/asm/sn/geo.h | 0 xen/include/asm-ia64/{linux => linux-null}/asm/sn/nodepda.h | 0 xen/include/asm-ia64/{linux => linux-null}/asm/sn/sn_cpuid.h | 0 xen/include/asm-ia64/{ => linux-null}/linux/bootmem.h | 0 xen/include/asm-ia64/{ => linux-null}/linux/cpu.h | 0 xen/include/asm-ia64/{ => linux-null}/linux/device.h | 0 xen/include/asm-ia64/{ => linux-null}/linux/file.h | 0 xen/include/asm-ia64/{ => linux-null}/linux/ioport.h | 0 xen/include/asm-ia64/{ => linux-null}/linux/kernel_stat.h | 0 xen/include/asm-ia64/{ => linux-null}/linux/module.h | 0 xen/include/asm-ia64/{ => linux-null}/linux/proc_fs.h | 0 xen/include/asm-ia64/{ => linux-null}/linux/profile.h | 0 xen/include/asm-ia64/{ => linux-null}/linux/ptrace.h | 0 xen/include/asm-ia64/{ => linux-null}/linux/random.h | 0 xen/include/asm-ia64/{ => linux-null}/linux/rtc.h | 0 xen/include/asm-ia64/{ => linux-null}/linux/seq_file.h | 0 xen/include/asm-ia64/{ => linux-null/linux}/serial.h | 0 xen/include/asm-ia64/{ => linux-null}/linux/serial_core.h | 0 xen/include/asm-ia64/{ => linux-null}/linux/signal.h | 0 xen/include/asm-ia64/{ => linux-null}/linux/smp_lock.h | 0 xen/include/asm-ia64/{ => linux-null}/linux/swap.h | 0 xen/include/asm-ia64/{ => linux-null}/linux/tty.h | 0 xen/include/asm-ia64/xenserial.h | 0 31 files changed, 5 insertions(+) create mode 100644 xen/include/asm-ia64/linux-null/README.origin rename xen/include/asm-ia64/{linux => linux-null}/asm/desc.h (100%) rename xen/include/asm-ia64/{linux => linux-null}/asm/ia32.h (100%) rename xen/include/asm-ia64/{linux => linux-null}/asm/module.h (100%) rename xen/include/asm-ia64/{linux => linux-null}/asm/pdb.h (100%) rename xen/include/asm-ia64/{linux => linux-null/asm}/serial.h (100%) rename xen/include/asm-ia64/{linux => linux-null}/asm/sn/arch.h (100%) rename xen/include/asm-ia64/{linux => linux-null}/asm/sn/geo.h (100%) rename xen/include/asm-ia64/{linux => linux-null}/asm/sn/nodepda.h (100%) rename xen/include/asm-ia64/{linux => linux-null}/asm/sn/sn_cpuid.h (100%) rename xen/include/asm-ia64/{ => linux-null}/linux/bootmem.h (100%) rename xen/include/asm-ia64/{ => linux-null}/linux/cpu.h (100%) rename xen/include/asm-ia64/{ => linux-null}/linux/device.h (100%) rename xen/include/asm-ia64/{ => linux-null}/linux/file.h (100%) rename xen/include/asm-ia64/{ => linux-null}/linux/ioport.h (100%) rename xen/include/asm-ia64/{ => linux-null}/linux/kernel_stat.h (100%) rename xen/include/asm-ia64/{ => linux-null}/linux/module.h (100%) rename xen/include/asm-ia64/{ => linux-null}/linux/proc_fs.h (100%) rename xen/include/asm-ia64/{ => linux-null}/linux/profile.h (100%) rename xen/include/asm-ia64/{ => linux-null}/linux/ptrace.h (100%) rename xen/include/asm-ia64/{ => linux-null}/linux/random.h (100%) rename xen/include/asm-ia64/{ => linux-null}/linux/rtc.h (100%) rename xen/include/asm-ia64/{ => linux-null}/linux/seq_file.h (100%) rename xen/include/asm-ia64/{ => linux-null/linux}/serial.h (100%) rename xen/include/asm-ia64/{ => linux-null}/linux/serial_core.h (100%) rename xen/include/asm-ia64/{ => linux-null}/linux/signal.h (100%) rename xen/include/asm-ia64/{ => linux-null}/linux/smp_lock.h (100%) rename xen/include/asm-ia64/{ => linux-null}/linux/swap.h (100%) rename xen/include/asm-ia64/{ => linux-null}/linux/tty.h (100%) delete mode 100644 xen/include/asm-ia64/xenserial.h diff --git a/xen/arch/ia64/Rules.mk b/xen/arch/ia64/Rules.mk index 69a78471b2..d1a1dc4a95 100644 --- a/xen/arch/ia64/Rules.mk +++ b/xen/arch/ia64/Rules.mk @@ -9,6 +9,7 @@ AFLAGS += -D__ASSEMBLY__ CPPFLAGS += -I$(BASEDIR)/include -I$(BASEDIR)/include/asm-ia64 \ -I$(BASEDIR)/include/asm-ia64/linux \ -I$(BASEDIR)/include/asm-ia64/linux-xen \ + -I$(BASEDIR)/include/asm-ia64/linux-null \ -I$(BASEDIR)/arch/ia64/linux -I$(BASEDIR)/arch/ia64/linux-xen CFLAGS := -nostdinc -fno-builtin -fno-common -fno-strict-aliasing @@ -20,6 +21,7 @@ CFLAGS += -fomit-frame-pointer -I$(BASEDIR)/include -D__KERNEL__ CFLAGS += -I$(BASEDIR)/include/asm-ia64 -I$(BASEDIR)/include/asm-ia64/linux \ -I$(BASEDIR)/include/asm-ia64/linux \ -I$(BASEDIR)/include/asm-ia64/linux-xen \ + -I$(BASEDIR)/include/asm-ia64/linux-null \ -I$(BASEDIR)/arch/ia64/linux -I$(BASEDIR)/arch/ia64/linux-xen CFLAGS += -Wno-pointer-arith -Wredundant-decls CFLAGS += -DIA64 -DXEN -DLINUX_2_6 diff --git a/xen/include/asm-ia64/linux-null/README.origin b/xen/include/asm-ia64/linux-null/README.origin new file mode 100644 index 0000000000..7432eb7d2d --- /dev/null +++ b/xen/include/asm-ia64/linux-null/README.origin @@ -0,0 +1,3 @@ +Files in this directory (and subdirectories) are intentionally left blank. +The sole purpose of this is to avoid removing/ifdefing include lines +from various source files. diff --git a/xen/include/asm-ia64/linux/asm/desc.h b/xen/include/asm-ia64/linux-null/asm/desc.h similarity index 100% rename from xen/include/asm-ia64/linux/asm/desc.h rename to xen/include/asm-ia64/linux-null/asm/desc.h diff --git a/xen/include/asm-ia64/linux/asm/ia32.h b/xen/include/asm-ia64/linux-null/asm/ia32.h similarity index 100% rename from xen/include/asm-ia64/linux/asm/ia32.h rename to xen/include/asm-ia64/linux-null/asm/ia32.h diff --git a/xen/include/asm-ia64/linux/asm/module.h b/xen/include/asm-ia64/linux-null/asm/module.h similarity index 100% rename from xen/include/asm-ia64/linux/asm/module.h rename to xen/include/asm-ia64/linux-null/asm/module.h diff --git a/xen/include/asm-ia64/linux/asm/pdb.h b/xen/include/asm-ia64/linux-null/asm/pdb.h similarity index 100% rename from xen/include/asm-ia64/linux/asm/pdb.h rename to xen/include/asm-ia64/linux-null/asm/pdb.h diff --git a/xen/include/asm-ia64/linux/serial.h b/xen/include/asm-ia64/linux-null/asm/serial.h similarity index 100% rename from xen/include/asm-ia64/linux/serial.h rename to xen/include/asm-ia64/linux-null/asm/serial.h diff --git a/xen/include/asm-ia64/linux/asm/sn/arch.h b/xen/include/asm-ia64/linux-null/asm/sn/arch.h similarity index 100% rename from xen/include/asm-ia64/linux/asm/sn/arch.h rename to xen/include/asm-ia64/linux-null/asm/sn/arch.h diff --git a/xen/include/asm-ia64/linux/asm/sn/geo.h b/xen/include/asm-ia64/linux-null/asm/sn/geo.h similarity index 100% rename from xen/include/asm-ia64/linux/asm/sn/geo.h rename to xen/include/asm-ia64/linux-null/asm/sn/geo.h diff --git a/xen/include/asm-ia64/linux/asm/sn/nodepda.h b/xen/include/asm-ia64/linux-null/asm/sn/nodepda.h similarity index 100% rename from xen/include/asm-ia64/linux/asm/sn/nodepda.h rename to xen/include/asm-ia64/linux-null/asm/sn/nodepda.h diff --git a/xen/include/asm-ia64/linux/asm/sn/sn_cpuid.h b/xen/include/asm-ia64/linux-null/asm/sn/sn_cpuid.h similarity index 100% rename from xen/include/asm-ia64/linux/asm/sn/sn_cpuid.h rename to xen/include/asm-ia64/linux-null/asm/sn/sn_cpuid.h diff --git a/xen/include/asm-ia64/linux/bootmem.h b/xen/include/asm-ia64/linux-null/linux/bootmem.h similarity index 100% rename from xen/include/asm-ia64/linux/bootmem.h rename to xen/include/asm-ia64/linux-null/linux/bootmem.h diff --git a/xen/include/asm-ia64/linux/cpu.h b/xen/include/asm-ia64/linux-null/linux/cpu.h similarity index 100% rename from xen/include/asm-ia64/linux/cpu.h rename to xen/include/asm-ia64/linux-null/linux/cpu.h diff --git a/xen/include/asm-ia64/linux/device.h b/xen/include/asm-ia64/linux-null/linux/device.h similarity index 100% rename from xen/include/asm-ia64/linux/device.h rename to xen/include/asm-ia64/linux-null/linux/device.h diff --git a/xen/include/asm-ia64/linux/file.h b/xen/include/asm-ia64/linux-null/linux/file.h similarity index 100% rename from xen/include/asm-ia64/linux/file.h rename to xen/include/asm-ia64/linux-null/linux/file.h diff --git a/xen/include/asm-ia64/linux/ioport.h b/xen/include/asm-ia64/linux-null/linux/ioport.h similarity index 100% rename from xen/include/asm-ia64/linux/ioport.h rename to xen/include/asm-ia64/linux-null/linux/ioport.h diff --git a/xen/include/asm-ia64/linux/kernel_stat.h b/xen/include/asm-ia64/linux-null/linux/kernel_stat.h similarity index 100% rename from xen/include/asm-ia64/linux/kernel_stat.h rename to xen/include/asm-ia64/linux-null/linux/kernel_stat.h diff --git a/xen/include/asm-ia64/linux/module.h b/xen/include/asm-ia64/linux-null/linux/module.h similarity index 100% rename from xen/include/asm-ia64/linux/module.h rename to xen/include/asm-ia64/linux-null/linux/module.h diff --git a/xen/include/asm-ia64/linux/proc_fs.h b/xen/include/asm-ia64/linux-null/linux/proc_fs.h similarity index 100% rename from xen/include/asm-ia64/linux/proc_fs.h rename to xen/include/asm-ia64/linux-null/linux/proc_fs.h diff --git a/xen/include/asm-ia64/linux/profile.h b/xen/include/asm-ia64/linux-null/linux/profile.h similarity index 100% rename from xen/include/asm-ia64/linux/profile.h rename to xen/include/asm-ia64/linux-null/linux/profile.h diff --git a/xen/include/asm-ia64/linux/ptrace.h b/xen/include/asm-ia64/linux-null/linux/ptrace.h similarity index 100% rename from xen/include/asm-ia64/linux/ptrace.h rename to xen/include/asm-ia64/linux-null/linux/ptrace.h diff --git a/xen/include/asm-ia64/linux/random.h b/xen/include/asm-ia64/linux-null/linux/random.h similarity index 100% rename from xen/include/asm-ia64/linux/random.h rename to xen/include/asm-ia64/linux-null/linux/random.h diff --git a/xen/include/asm-ia64/linux/rtc.h b/xen/include/asm-ia64/linux-null/linux/rtc.h similarity index 100% rename from xen/include/asm-ia64/linux/rtc.h rename to xen/include/asm-ia64/linux-null/linux/rtc.h diff --git a/xen/include/asm-ia64/linux/seq_file.h b/xen/include/asm-ia64/linux-null/linux/seq_file.h similarity index 100% rename from xen/include/asm-ia64/linux/seq_file.h rename to xen/include/asm-ia64/linux-null/linux/seq_file.h diff --git a/xen/include/asm-ia64/serial.h b/xen/include/asm-ia64/linux-null/linux/serial.h similarity index 100% rename from xen/include/asm-ia64/serial.h rename to xen/include/asm-ia64/linux-null/linux/serial.h diff --git a/xen/include/asm-ia64/linux/serial_core.h b/xen/include/asm-ia64/linux-null/linux/serial_core.h similarity index 100% rename from xen/include/asm-ia64/linux/serial_core.h rename to xen/include/asm-ia64/linux-null/linux/serial_core.h diff --git a/xen/include/asm-ia64/linux/signal.h b/xen/include/asm-ia64/linux-null/linux/signal.h similarity index 100% rename from xen/include/asm-ia64/linux/signal.h rename to xen/include/asm-ia64/linux-null/linux/signal.h diff --git a/xen/include/asm-ia64/linux/smp_lock.h b/xen/include/asm-ia64/linux-null/linux/smp_lock.h similarity index 100% rename from xen/include/asm-ia64/linux/smp_lock.h rename to xen/include/asm-ia64/linux-null/linux/smp_lock.h diff --git a/xen/include/asm-ia64/linux/swap.h b/xen/include/asm-ia64/linux-null/linux/swap.h similarity index 100% rename from xen/include/asm-ia64/linux/swap.h rename to xen/include/asm-ia64/linux-null/linux/swap.h diff --git a/xen/include/asm-ia64/linux/tty.h b/xen/include/asm-ia64/linux-null/linux/tty.h similarity index 100% rename from xen/include/asm-ia64/linux/tty.h rename to xen/include/asm-ia64/linux-null/linux/tty.h diff --git a/xen/include/asm-ia64/xenserial.h b/xen/include/asm-ia64/xenserial.h deleted file mode 100644 index e69de29bb2..0000000000 -- 2.30.2